Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 26 Apr 2011 06:17:52 +0000 (23:17 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 26 Apr 2011 06:17:52 +0000 (23:17 -0700)
commit05b3aa73764a2a450a10811b188e353bf8bc6599
treeae546da01000b298b372aba7227cf4eceff25eba
parentb5ca86867556bf2e04a2ede9808b2ae349b2a257
parent87e400b4c75a9c5673c95e7b5bb598b6556a0711
Merge from mainline.
19 files changed:
ChangeLog
Makefile.in
configure.in
src/ChangeLog
src/buffer.c
src/callint.c
src/character.c
src/charset.c
src/coding.c
src/doc.c
src/font.c
src/gnutls.c
src/lisp.h
src/process.c
src/syntax.c
src/sysdep.c
src/textprop.c
src/xdisp.c
src/xfaces.c